create conflict
change price to 300
resolve conflict