added revers sorting
fixed conflicts