Fixed map not being visible after drag, merge error