will create merge confict 2
try to make a conflict 2
solve the conflict