Change the Nick file to merge