working app
fixed conflicts