readme merge fix