conflicts resolved manually

css is still screwed.