lok and feel
fixing conflicts
broken but all conflicts seem to be fixed