Video after conflict resolved.