Why did this merge weird

I have no idea what I'm doing