Fix Merge and don't include mimarket