Switched to client parsing
Fix conflict in README