Conroe Main Street Market returns after fee battle, could go weekly in September