solved merge problems; fixed header in all views