Fixed broken brackets
Merge conflict