Update fe conflict