Bugfix: propagate metadata_conflicts in recursive calls to merge()
Bugfix: propagate metadata_conflicts in recursive calls to merge()

AustereCuriosity/astropy,MSeifert04/astropy,lpsinger/astropy,MSeifert04/astropy,astropy/astropy,joergdietrich/astropy,MSeifert04/astropy,lpsinger/astropy,joergdietrich/astropy,aleksandr-bakanov/astropy,pllim/astropy,funbaker/astropy,StuartLittlefair/astropy,funbaker/astropy,StuartLittlefair/astropy,joergdietrich/astropy,mhvk/astropy,larrybradley/astropy,larrybradley/astropy,larrybradley/astropy,lpsinger/astropy,lpsinger/astropy,astropy/astropy,AustereCuriosity/astropy,mhvk/astropy,pllim/astropy,tbabej/astropy,joergdietrich/astropy,dhomeier/astropy,aleksandr-bakanov/astropy,larrybradley/astropy,kelle/astropy,kelle/astropy,tbabej/astropy,pllim/astropy,StuartLittlefair/astropy,bsipocz/astropy,aleksandr-bakanov/astropy,MSeifert04/astropy,kelle/astropy,DougBurke/astropy,larrybradley/astropy,DougBurke/astropy,AustereCuriosity/astropy,AustereCuriosity/astropy,tbabej/astropy,tbabej/astropy,bsipocz/astropy,tbabej/astropy,stargaser/astropy,bsipocz/astropy,DougBurke/astropy,astropy/astropy,astropy/astropy,AustereCuriosity/astropy,saimn/astropy,joergdietrich/astropy,bsipocz/astropy,StuartLittlefair/astropy,pllim/astropy,lpsinger/astropy,StuartLittlefair/astropy,astropy/astropy,saimn/astropy,dhomeier/astropy,funbaker/astropy,kelle/astropy,stargaser/astropy,DougBurke/astropy,funbaker/astropy,mhvk/astropy,dhomeier/astropy,saimn/astropy,aleksandr-bakanov/astropy,kelle/astropy,dhomeier/astropy,dhomeier/astropy,mhvk/astropy,saimn/astropy,stargaser/astropy,saimn/astropy,mhvk/astropy,stargaser/astropy,pllim/astropy