for the final PR please provide us one commit only. you can use

```git reset --soft <version_before_your changes>```

to get all your commits back to non-committed. Then just git commit -a everything