Fix merge conflict
Merge pull request #279 from JohnMai/anthonylim

Fix merge conflict