time to learn rebase + squash :)