cleanups from merge conflicts from force inserting commit before root commit