catering stuff
fixed conflicts