fixed hook
Simple Merge
New Player Controller
merge