Need 2 commits to make this file newer than in v2 branch and test
"resolve" merge strategy.