fixed merge conflict
fixed merge conflict

TheFourLoops/TheFourLoops,murmurs/CodeFighter,a-nguyen/CodeFighter,ccheung0926/TheFourLoops,ccheung0926/TheFourLoops,Way2nnadi/CodeFighter,a-nguyen/CodeFighter,TheFourLoops/TheFourLoops,jkf91/CodeFighter,codeCommode/TheFourLoops,jkf91/CodeFighter,codeCommode/TheFourLoops,murmurs/CodeFighter,Way2nnadi/CodeFighter,SlackingPalico/CodeFighter,SlackingPalico/CodeFighter,sinwailam193/TheFourLoops,sinwailam193/TheFourLoops