Commiting after modifying the UIs based on client views
Commiting after removing conflicts