fixed drawRec
fixed conflicts