prima: Remove the leftovers of bad merges