fix additional git conflict braces.