fixing filenames
fixing merge