update c++ mode
handle conflict