Merge conflict introduced