merge conflict
merge conflict
cleanup
remove body fade transition