fixed 'merge'