Skip most checks on prose (not code) files
Fix merge issue