Fix conversion
Fix merge conflict