noconflicts plz
fixed conflicts