corrected a wild merge conflict