Hide competency table
Remove merge conflict