hr flow
resolving conflicts