Resolve merge conflicts, added review tab