resolve api conflicts after pull
User Entity