managed merge conflicts