Resolving some conflicts between branches, all superficial