Adding change A
Final conflict resolution of merge conflicts