manual merge with bitbucket repository (dashboard and map development)