Fix after mismatch
Merge branch 'master' into different_push
Changed rule