fixed the merge comment i missed