Removed stray commit with merge junk in it