first commit intended to generate a conflict
Merged conflict