commiting to clear up conflicts