last commit before switch to gitflow