conflict branch update