Edit feedback.js, feedback.php
merge