informing gets templating
fixed conflicts