Update Vaughn.xml
Pull is not possible because you have unmerged files.