Remove dublicated js code after merge conflict