Remove unnecessary merge conflict files