Fix broken css and js from merge conflict.