cleaned up a merge