Remove jsx
Merge conflicts