Properly written tests

Git says to me: "We can't automatically merge these branches". Is it due to changes in class names? UserBox -> TopPsychic & UserBoxTest -> TopPsychicTest. Is it possible to merge this ??