diff --git a/print-server.js b/print-server.js
index 044116c..12e3115 100644
--- a/print-server.js
+++ b/print-server.js
@@ -85,16 +85,11 @@ class PrintServer {
 
         try {
             await conn.beginTransaction();
-<<<<<<< HEAD
             [[printJob]] = await conn.query(selectQuery);
             if (!printJob) {
                 conn.rollback();
                 return;
             }
-=======
-            [[printJob]] = await conn.query(selectQuery);
-            if (!printJob) return;
->>>>>>> b9b83b979507038a3f39ef7c1ed47d9c316191fe
 
             jobId = printJob.id;
             this.method = printJob.method;
@@ -113,8 +108,9 @@ class PrintServer {
                 args[row.name] = row.value;
             try {
                 let methodPath = this.method.replace(/{\w+}/g, function(match) {
+                    const params = {id: args.collectionFk};
                     const key = match.substr(1, match.length - 2);
-                    const value = args[key];
+                    const value = params[key];
                     return value !== undefined ? value : match;
                 });