fix else guard in resolve conflict algorithm