maps feature ok
merge fix