add rationale
resolve merge conflicts