Fixed a conflict (diff) that was accidentally committed in min file