Resolve conflict using by removing one-to and choosing first-n-numbers procedure