ending movie & music added
merge conflict