Conflict fixes for ZLM

Campaign/WoL stuff conflict fixes