ugly stuff removed from the merge