Added word 'Super' to file.
New file file_b.
Fixed bug.
Add one line to file_b.
Merge branch 'issue53' into 'master'.
Fixed conflict.