fixed conflicts
changed css and js files
fixed css