Add query and javascript
whats going on

coming soon should  be gone, conflict error go away please