code review specs
resolve conflict