login chidito
conflicts solved