cleaned up mess resulting from an inept git merge