Update figure
update conflict