try to commit conflicts