fixing RPi redirect at login and merge conflict marker leftover