correcting a file existence bug
fixing merge