Resolve conflicts and merge.