fixed those merge things