Resolve conflict and merge