Fix merge conflict #430