Code cleaning, add option to disable chat merge