fixed merge-conflicts