augmented some test
conflict fix