introducing merge conflict