Camiando
resolve conflict