fix all merge confict files