cleaned up git merges