finished API update
resolved conflict