#2b from b
#2b from b 2
conflict modified2