rebase upstream
remove unmerge coffee