issues fixed
js cache file
resolved conflicts