try force merge 2
Merge branch 'dev'
before 3rd merge