Fix typo that was breaking merge functionality
Merge pull request #12 from OshinKaramian/master

Fix issues with gitMerge