Squashing the three commits to one