Peer pressure would seem to refer to the influence that someone, or some group, has on someone that encourages them to change their behaviors, beliefs, attitudes, etc. Conformity would be the actual act of comforming to the norms of that group/person.