Remove references to 'merge'