Fix merge bug with ending braces