elad second commit

21:21
fixed conflicts