fixed moar bugz
conflict fixes