Remove merge conflict in Rakefile