Trying to get this out of merge state

Idk what I'm doin, but trying to get it out of a merging state