here we have some merge issues