Can't believe this regex worked the first f'in try!
Merge remote branch 'origin/master'

Conflicts:
	util/migrate-interface-type-ethernet-to-bridge.rb
Put conversion logic into convert!()