Mergin nick into master