removed old jquery selections
fixed mergeconflict