Merge "conflict process"