removing hidden
trying to fix it
concluding merge