commiting before a merge
commiting after conflict resolution
Bids are kinda working