put the unix.c.rej file back and renamed it to unix.c.merged