fixed the merge bullshit