Resolved merge conflict in RF24.cpp