fixed mergz, hope I didnt break anything, but I dont think I did