add fadeOut animation as suggestion
Resolving merge conflict