Added how to do complicated conflict resolutions