fixed merge-conflict in Map