merge with map activity