Fix merge conflict
Fix merge conflict

cparnot/INAppStoreWindow,sdesimone/INAppStoreWindow,appden/INAppStoreWindow,sdesimone/INAppStoreWindow,xvtom/INAppStoreWindow,indragiek/INAppStoreWindow,appden/INAppStoreWindow,xvtom/INAppStoreWindow,cparnot/INAppStoreWindow,indragiek/INAppStoreWindow