Guillemdb Fix README conflicts