final pre conflict
resolvew conflict