added detail scroll
resolve conflict