git / git-core conflicts - please don't delete bodhi tickets