changed solveconflict so it uses insertfeature method
fixed launching and killing of gateway in non-windows