retry to fix merge conflicts