Change B
Fixing merge conflicts from A and B