resolve mergin conflict