Resolving changelog conflicts