ignore .ruby-version
merge conflict