Merging a conflict.