Fixed cactus top

The cactus was on fringe, but the cliff on over. Moved the cactus to an
over layer to prevent the top from getting hidden under the cliff.

Also fixed small duplicate tile issue at the cliff next to the mine
entrance.