Causing Merge Conflict