tasks added
gemfile changes
merging