manager user store manager are changed
conflict resolved