Remove left-over merge markers.

Looks like code-analysis and sources should both be kept.