Potentially fixed merge