updated ph pt-br profile
updated ph en profile
fix conflicts