clean up
add jquery conflit resolutions