Changed icradio player on sidebar to stop buffering on page load and identified source types

Since my last foray into commit editing I accidentally edited Jonny's changes and apparently committed as him? And somehow branches merged? Or am I just too confused?
Yet, this seems to show a diff as if that commit and those changes haven't already happened...

Comments, all?