cant get this working

nothing
debug

debug
Merge remote-tracking branch 'origin/master'

conflicts