Is this the official way to resolve conflicts? I always use git to do it.