merges that crossed in the night...  fix