Added documentation for conflict resolution of metadata
Added documentation for conflict resolution of metadata

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