Merging when there are conflicts and how to resolve

Last updated