Fix git-merge framents.
Merge pull request #35 from Lasall/merge-framents-fix

Fix git-merge framents.