Uploading full app
With conflicts from new app merged