double precision betaT
      integer iscode,indpdb,outpdb,outmol2,iopt,nstart,nend,constr_dist
      logical refstr,pdbref,punch_dist,print_dist,caonly,lside,
     & lprint_cart,lprint_int,from_cart,efree,from_bx,from_cx,
<<<<<<< HEAD
     & with_dihed_constr
      common /cntrl/ betaT,iscode,indpdb,refstr,pdbref,outpdb,outmol2,
     & punch_dist,print_dist,caonly,lside,lprint_cart,lprint_int,
     & from_cart,from_bx,from_cx,efree,iopt,nstart,nend,constr_dist,
     & with_dihed_constr
=======
     & with_dihed_constr,out1file,print_homology_restraints,
     & print_contact_map,print_homology_models
      common /cntrl/ betaT,iscode,indpdb,refstr,pdbref,outpdb,outmol2,
     & punch_dist,print_dist,caonly,lside,lprint_cart,lprint_int,
     & from_cart,from_bx,from_cx,efree,iopt,nstart,nend,constr_dist,
     & with_dihed_constr, constr_homology,homol_nset,out1file,
     & print_contact_map
      common /cntrlr/ waga_homology(10),
     & waga_dist, waga_angle, waga_theta, waga_d, dist_cut,iset,
     & print_homology_restraints,print_homology_models

>>>>>>> 3d6f9e7... Adam's changes to wham and cluster following previous commit