fix README conflicts