Gem update and removal of merge conflict indicator
Bump version to 0.1.35