Made it so receiving a conflicts email from someone updates their conflicts rather than just add new ones