Update the flow inside the conflicter so it works with 'diff' option