Finally fix merge conflicts