fixed some merge issues again