Resolve merge errors in 2D map editor