resolved some mereg conflicts