Fixing closing bracket and conflict messages.

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>