Modified class A
Merge remote-tracking branch 'origin/master' into modClassA
Merge remote-tracking branch 'origin/master' into modClassA
Modified class B
Default class B
merge A and B