Fixing some merge issues