Causing merge conflict from Local