new refs
fixed conflicts of unknown origin