Fixed merge error in drpc.clj