resolved merge errors

Conflicts:
	src/modules/tools/toolmanager/ToolManager.cpp