Tried to remove merge conflict text PLEASE check for this and remove in future
resolved conflict

Conflicts:
	resources/faq.md