fixing view merge conflict with fadeout