Update to new version
Fix merge conflict