Added updated table
merged conflict