changed merge method to be squash like before
changed merge method to be squash like before

mitre-cyber-academy/ctf-scoreboard,mitre-cyber-academy/ctf-scoreboard,mitre-cyber-academy/ctf-scoreboard,mitre-cyber-academy/ctf-scoreboard