Fix merge conflicts

Third times a charm...