fixed error from merge