cleared js
testing conflicts
fixed conflict