Commit 6
Merged branch "A"