Updated zip file with merge fix