start of local jacks repository
resolve local online conflicts