fixed rakefile's merge