Before Merge MixItUp
Resolution conflict
MixIpUp Ok