fixing git history 2..