conflicts resolved

pull should work now