unmerged commit from master, newfoo, hotfix