diff --git a/CHANGELOG.md b/CHANGELOG.md
index be8c8ff..442a000 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@

Change Log

+<<<<<<< HEAD
+## Unreleased
+
+Full Changelog
+
+Merged pull requests:
+
+- Add a rake task #260 (raphink)
+- Add release_url option #259 (raphink)
+- Add --since-tag, close #257 (raphink)
+=======

1.12.0 (2016-04-01)

Full Changelog

@@ -245,6 +256,7 @@

• Add a rake task #260 (raphink)

• Add release_url option #259 (raphink)

• Add --since-tag #257 (raphink)
  +>>>>>>> refs/remotes/skywinder/master

  1.7.0 (2015-07-16)

  Full Changelog
  diff --git a/lib/github_changelog_generator/generator/generator_generation.rb b/lib/github_changelog_generator/generator/generator_generation.rb
  index b22fe40..efaa14d 100644
  --- a/lib/github_changelog_generator/generator/generator_generation.rb
  +++ b/lib/github_changelog_generator/generator/generator_generation.rb
  @@ -118,7 +118,7 @@ def generate_log_between_tags(older_tag, newer_tag)

  @return [Array] filtered issues and pull requests

  def filter_issues_for_tags(newer_tag, older_tag)

  •  filtered_pull_requests = delete_by_time(@pull_requests, :actual_date, older_tag, newer_tag)
    

  •  filtered_pull_requests = delete_by_time(@pull_requests, :merged_at, older_tag, newer_tag)
    

    filtered_issues = delete_by_time(@issues, :actual_date, older_tag, newer_tag)

    newer_tag_name = newer_tag.nil? ? nil : newer_tag["name"]

I'll close this - looks like robot spam.