This shouldn't be in the commit, can cause merge conflicts although no actual change has been made.