update walkout
resolve conflicts