update up button
fixed merge conflicts