resolve conflicts
comment peripheral tables
complete comments for 4 controllers
fix conflict representerController
modify the comments of 19 controllers