titlebar map activity removed
merge conflict