trying to fix a small part of the mess that i made with the merge