fixed some merge issues