Fix conflicts in observer and observer tests