Resolved conflict.