Trying again to resolve conflict.