event create javascript
merge conflict