Fixed merge error for Tailor Model