fixing the merge I messed up