Fixing some conflicts in anurse-253 due to changes here