fixed error which stemmed from merge