Recommitting changes that got overridden