merged both sites completely (markup has to be fixed)