hoppers list
update
resolve merge conflicts