added section on how to resolve merge conflicts