merge test is failing finally