Clean up conflict markers, FAQ link, CR newlines