conflict resolve
added fancybox stuff