Jake and I are new to this sourcetree stuff and we have no idea how to resolve conflicts. So.....here is a resolved playercontroller that was not resolved in the pull/push process