started student backend
fixed conflicts