Fix merge issues; Fix missing }