code review: merge hash
resolve conflict