More work on merging history view