Would be nice to have a workflow where the changelog changes along with the bug though; I'd be okay dealing with conflicts on this file unless things get really crazy.