hiding and showing
fixed merge conflict