added sudo=sudo
fixed merge conflicts