commit conflicts