Add missing semicolon
Remove merge warning