scroll up and down works
fixed merge conflict