Fix merging chaos concerning comments branch
Merge pull request #3 from cloudyMBC/comments-merge-fix

Fix merging chaos (comments branch)