I have restored the site template from Dev environment to QA (Web Designer Galleries->Solutions). when I create a subsite using the restored template, I am getting the error "The file _catalogs/masterpage/AdvancedSearchLayout.aspx has been modified by ..." as below.