fixing conflict in sphinx doc
fixing conflict in sphinx doc

bretthandrews/marvin,bretthandrews/marvin,albireox/marvin,bretthandrews/marvin,albireox/marvin,bretthandrews/marvin,sdss/marvin,sdss/marvin,albireox/marvin,sdss/marvin,sdss/marvin,albireox/marvin