MNT: Fixing merge conflicts