do it properly and have squash merges

If you have big features that deletes a lot of maybe important commit history.