fixed some merge mistakes