Error after updating frappe/erpnext from develop branch

Hi ,
I need to pull new fixes in the develop mode so i switch to develop and git pull upstream develop for each frappe and erpnext ,
i got this error
Exception: Bad translation in ‘erpnext’ for language ‘ar’: [u’<<<<<<< HEAD’]


You have conflicts in the erpnext app, please resolve the conflicts manually, search for the <<<<<< in the code

thanks i did