Update conflicts