Will create merge conflict