Commit resolution conflits Antoine