Fix merge issues

services/web/app/views/project/editor/editor.jade

@@ -72,13 +72,9 @@ div.full-size(
 									.rp-entry-avatar(style="background-color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%);") {{ users[entry.metadata.user_id].avatar_text }}
 								.rp-entry-body
 									{{ entry.content }}
-<<<<<<< HEAD
-								.review-entry-actions
+								.rp-entry-actions
 									a(href, ng-click="acceptChange(entry_id)") Accept
 									a(href, ng-click="rejectChange(entry_id)") Reject
-=======
-								.rp-entry-actions
->>>>>>> cb425e7dba4f0caa9629cc7f5c45b4a4992de609
 
 							div(ng-if="entry.type == 'comment'")
 								div(ng-repeat="comment in entry.thread", class="comment-thread__comment")