Fix README conflicts