checking in conflicts
this is going to be conflicting
solving the conflict