squash everything and rebase on clean master