Remove HEAD/master merge notes.

It appears that during a merge, "<<<<<<< HEAD" and ">>>>>>> master" labels were left in the widget code. These have been removed.
Merge pull request #2641 from tollmanz/master

Remove HEAD/master merge notes.