fix the first time column's header
clean up import statements
conflict fix