live typing feedback and image
fixed conflicts