fixed mistakes that arose from merge