Finished fixing ListView and roll conflict resolution.