Merged conflicting changes