Push nick code
Change the Nick file to merge