Recompile to fix merge conflicts

Fixes #828