Resolve confilcts