squashing last 5 commits into 1