blackwhale/phobos — comment on commit 3c8946dc40ff630de0ef0db1ed556b713fbd57a3
File:  line 0
By blackwhale:

I recall Jonathon explicitly asking for doing changelog in a separate pull request to avoid merge conflicts.
I'm not sure what's better here or why would it cause merge conflicts in the first place.