corrections to dangling brackets and other minor merge failures