The changes for this file should be not part of the pull-request but better be an extra commit.