minor adjustments based on code review
resolve merge conflicts