A psychologist named Kelman identified three types of conformity, back in 1958:
compliance: conforming to other's views, beliefs or behaviour in public, but in private maintaining your own.
Identification: actually adopting the views, beliefs, or behaviour of a group, but only when the group is there, with you. The new attitude usually dissolves when you leave the group.
Internalization: a true conversion to a different set of beliefs, views, or behaviour. The new attitude is truly valued, even when the group is not present. The values stay with you even when you leave the group.

Claiming to have certain views to avoid an arguement does not really apply to conformity, as long as it is personally acknowledged.