Setting git resolution