Commit conflicts functionality