trying to fix whatever messed up when i branched