Fixed merge errors and file size variable