Merge correct version of skyscraper game