Fixed anoter incorrect merge conflict resolution.