Delete 'Merge Conflicts' bundle.

Will be re-added as submodule soon.
Add 'Merge-Markers.tmbundle' as submodule.
Submodule updates.