find a way around changelog conflicts

[limlam96]

These are becoming a pain, some suggestions below:

https://medium.com/@nettsundere/on-reducing-changelog-merge-conflicts-1eb23552630b

From this article, I potentially lean towards just adding placeholder lines to the file?

[adamsardar]

Would #254 be a potential solution? Its come up in several places - internal and external, so might be worth my hammering out a poc?

[limlam96]

yeah sounds better - maybe a question as to whether while we're prioritising polars stuff we want to implement the quick/rough solution of just adding placeholder lines as a stop gap though