some merge issues fixed