causing merge conflict by local