remove conflict text commit