added losing screen
fixed conflicts