libcorkscrew: Fix merge errors