Resolve conflict between branches.