Merged rule conflict prevention with previous commit