fixed merge-issues