cleaning up conflicts between group code not yet committed and