MBH: fixing an auto merge of old and new branch from back up machine