after merge mapviewcontroller