merge portal changes