Fixed bracket issue caused by merge conflict