changes
fix conflicts
compress js file