Add jsx plugin
Fix merge