removed conflicts
removed conflicts
test fixes