Fixed merge conflicts in Tile.java