Fix merge conflict in updates