Fixing formatting of brackets and merge conflicts Data