Completes feedback report
fixes merge conflicts
fixes img src