Fix dodgy merge-related commits