merge confict files.