for merge
fixed conflicts
fixed getTile