fixed the same merge error as before. But this time I did it right