merge up until common-8, but without if
merge error in last commit - all working up to common-8, but w/o if
deleted leftover merge syntax