changes
fixed conflict
js updates
css updates