Actor and Director Fixed
complete merge
merge