Fixed README conflicts