REV: resolved conflict.