Fixed errors. KiaDemo running properly.
Conflict resolved.