fixed warnings after "manual merge"