Player Action Changed logic added
resolved conflicts