merging more conflicts