merge conflist resolution