refactor conflict resolved