commit to pull
removed conflicts
modified testserver