Forgot to remove a conflict
Resolve readme conflict