issue resolved for faq and style.css updated
conflict removed
conflict removed db.yml