fix 2.2.3 merge conflicts