improved merge conflicts section