Learning how I can merge work and deal with merge conflicts