Small edit on fileA
Changed line, resolved conflict