Update Vaughn.xml
Pull is not possible because you have unmerged files.
Merge branch 's-zk-patch-1'