Fixed merge errors from gogole vode