merge error in last commit - all working up to common-8, but w/o if