Model files conflict fix