remove conflict files accidentally committed