add conflicts and update locales