This shouldn't be part of the commit, there may have been an issue with your merge