Fix continuous merging
Remove warning messages