Fixed A Merge Issue
added all the vim? I guess I don't know So many commits though lol