Update conflicter and related test