I'm not sure why this file is included in this pull request, when it is already part of another. Is this deliberate? Will it not cause merge difficulties?