try solve conflict manually