finished review
fixed merge conflict