@johnament ok, so how about squashig these 3 commits into a single one?