Fix merge conflict in hhvm 9999 and remove vim swp file