[IMP] Improve visibility changes as specified in task
[IMP] remove conflicts