add ratings controller
fix merge error in edit.html and header.html