fixed cadence, trying to fix game difficulty
fixed merge conflict