fix merge conflicts by updating from main