changed a function name lol
merge