remove conflict lines