Original plugin dir
Fixed merge issues