Fix merge auto-add text