starting repeat work
fixed conflicts;