Rebasing 6 commits into 1