Fix merge errors. Fixes #45