Fix merge conflict files