debug
conflicts resolved
update due to safari 7.1 css issue