FAQ update
Fix CR LF line endings
fix conflicts