fixed merge conflict, changed beat to 120 ticks