Merge conflict fix: replace bitcoinrpc.h include with:
#include "rpcserver.h"