diff --git a/include/class.file.php b/include/class.file.php
index 99aad650aa051e7676fa7e5e905a49a8ff3251d5..c53858e33a1dc78e55105ff80aa6add37760ce28 100644
--- a/include/class.file.php
+++ b/include/class.file.php
@@ -891,7 +891,7 @@ class AttachmentChunkedData extends FileStorageBackend {
             // Chunks are considered immutable. Importing chunks should
             // forceable remove the contents of a file before write()ing new
             // chunks. Therefore, inserts should be safe.
-            $chunk = AttachmentFileChunk::create(array(
+            $chunk = new AttachmentFileChunk(array(
                 'file' => $this->file,
                 'chunk_id' => $this->_chunk++,
                 'filedata' => $block
diff --git a/scp/tickets.php b/scp/tickets.php
index 72a7c8a34486251f4d7605e8eec82d95662ec2a6..aa8347f8173b777762ee92ccc3e40944bce5cc0e 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -86,11 +86,7 @@ if($_POST && !$errors):
             else {
                 $vars = $_POST;
                 $vars['cannedattachments'] = $response_form->getField('attachments')->getClean();
-<<<<<<< HEAD
-                $vars['response'] = ThreadBody::clean($vars['response']);
-=======
                 $vars['response'] = ThreadEntryBody::clean($vars['response']);
->>>>>>> upstream/develop-next
                 if(!$vars['response'])
                     $errors['response']=__('Response required');
 
@@ -147,9 +143,6 @@ if($_POST && !$errors):
             $attachments = $note_form->getField('attachments')->getClean();
             $vars['cannedattachments'] = array_merge(
                 $vars['cannedattachments'] ?: array(), $attachments);
-<<<<<<< HEAD
-            $vars['note'] = ThreadBody::clean($vars['note']);
-=======
             $vars['note'] = ThreadEntryBody::clean($vars['note']);
 
             if ($cfg->getLockTime()) {
@@ -164,7 +157,6 @@ if($_POST && !$errors):
                     $errors['err'] = __('Your lock has expired. Please try again');
                 }
             }
->>>>>>> upstream/develop-next
 
             $wasOpen = ($ticket->isOpen());
             if(($note=$ticket->postNote($vars, $errors, $thisstaff))) {