my changelog was in conflict, resolving this