merge working on easy case