Keep the Changelog, Avoid the Conflicts

1 points | by domenkozar 4 hours ago