first code review
resolved conflicts