fixed conflicts

…and removed search path from rupe's computer