Fix some more conflicts