removed double functions from merge