conflict code tweaks and cleanups