Resolved resume conflict.