account register and update api updates
fix conflicts