merge
gui show fixed