fixing remaining merge conflict
fixing remaining merge conflict

saimn/astropy,MSeifert04/astropy,StuartLittlefair/astropy,lpsinger/astropy,pllim/astropy,lpsinger/astropy,stargaser/astropy,pllim/astropy,bsipocz/astropy,bsipocz/astropy,larrybradley/astropy,StuartLittlefair/astropy,aleksandr-bakanov/astropy,stargaser/astropy,aleksandr-bakanov/astropy,mhvk/astropy,StuartLittlefair/astropy,aleksandr-bakanov/astropy,astropy/astropy,MSeifert04/astropy,MSeifert04/astropy,StuartLittlefair/astropy,lpsinger/astropy,astropy/astropy,mhvk/astropy,larrybradley/astropy,stargaser/astropy,larrybradley/astropy,astropy/astropy,saimn/astropy,stargaser/astropy,saimn/astropy,StuartLittlefair/astropy,bsipocz/astropy,bsipocz/astropy,pllim/astropy,lpsinger/astropy,pllim/astropy,mhvk/astropy,dhomeier/astropy,saimn/astropy,mhvk/astropy,dhomeier/astropy,dhomeier/astropy,lpsinger/astropy,mhvk/astropy,larrybradley/astropy,pllim/astropy,larrybradley/astropy,dhomeier/astropy,aleksandr-bakanov/astropy,astropy/astropy,dhomeier/astropy,astropy/astropy,saimn/astropy,MSeifert04/astropy