fix small merge conflict oversight