first commit intended to generate a conflict
merged conflict