Fix unresolved conflict re: fadeOut