Fixes small merge issues in final paper.