mmm something was wrong witht the pre tag.. not sure what.
Merge remote-tracking branch 'origin/master'