alter a and b
resolve conflict