Index: utils/checkstyle/import-control.xml
===================================================================
diff -u -N -r18dbee572ff61918cb5939f5f89f14d09e7a5f3f -rd4a6a8430fa8d954b0fc5ecdcc6a7bda424224ad
--- utils/checkstyle/import-control.xml	(.../import-control.xml)	(revision 18dbee572ff61918cb5939f5f89f14d09e7a5f3f)
+++ utils/checkstyle/import-control.xml	(.../import-control.xml)	(revision d4a6a8430fa8d954b0fc5ecdcc6a7bda424224ad)
@@ -95,6 +95,7 @@
 	    	<allow pkg="compbio.metadata" class="jalview.gui.WsJobParameters"/>
 	    	<allow pkg="fr.orsay.lri.varna" class="jalview.gui.AppVarna"/>
 	    	<allow pkg="fr.orsay.lri.varna" class="jalview.gui.AppVarnaBinding"/>
+	    	<allow pkg="org.stackoverflowusers.file" class="jalview.gui.Desktop"/>
 	    	<allow pkg="uk.ac.vamsas" class="jalview.gui.VamsasApplication"/>
 	    </subpackage>
    		
@@ -117,7 +118,13 @@
 	    	<allow pkg="uk.ac.vamsas"/>
 	    	<allow pkg="fr.orsay.lri.varna"/>
 	    	<allow pkg="MCview"/>
+<<<<<<< HEAD
+			<subpackage name="vcf">
+		    	<allow pkg="htsjdk\.*" regex="true"/>
+			</subpackage>	    
+=======
 	    	<allow pkg="htsjdk.samtools"/>
+>>>>>>> origin/features/JAL-2909_bamImport2_11
 		</subpackage>	    
 		   		
 		<subpackage name="javascript">