conflict.txt committed from B1