list works, believe it or not
fixed merge conflicts