fix some merge mistakes