syanptics_i2c_rmi.h: fix merge errors