Commit conflicts resolution