resolved merge conflict with isFriend