fixd readme conflict