solved some issues
conflict at en