fixed merge-error