first commit intended to generate a conflict