add code review comments
resolve conflict