Fix capitalization.
Fix conflict.
Merge branch 'master' of https://github.com/hajipion/test-git