Somthing broke with the pull so I fixed it?
Merge remote-tracking branch 'origin/master'