removed bracket lines left behind from merge conflict