Fix to merge issues