Updating no conflicts mode & rakefile