Undo last commit to redo with proper merging/integration