Merged conflict