fixed the manual merge messup