images and header bar
resolved conflict
resolve conflict