tweaks and works
merge
conflict resolvement