Removes merge conflict leftover