Fix merge conflict in case