Weird merge message

not sure what's going on here