Fix conflict
Merge pull request #1 from suin/fix-conflict

Fix conflict