Committing changes
Fixed braces and conflicts