deadlock solved
fixed conflicts