Fixed bracket issue caused by merge conflict
Merge branch 'phases'