creating merge issue
Resolving merge conflict
resolve merge
Merge branch 'tlocal'
resolve merge issue
Merge branch 'tlocal'
resolve merge
resolve merge issue
Merge branch 'tlocal'
resolve merge
edit Gemfile