Conflicts: src/com/maddyhome/idea/vim/group/ChangeGroup.java test/org/jetbrains/plugins/ideavim/action/ShiftRightLinesActionTest.java