diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp
index 2090bbaf..b066b91d 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp
@@ -94,21 +94,12 @@ $(window.document).ready(function() {
     var re = /(?:\.([^.]+))?$/;
     <c:forEach var="attachFile" items="${searchArticle.attachFiles }" varStatus="status">
     myDropzone.addFile({
-<<<<<<< HEAD
     	name: '<c:out value="${attachFile.orignlFileNm}" />', 
     	size: <c:out value="${attachFile.fileSize}" />, 
     	type:re.exec('<c:out value="${attachFile.orignlFileNm}" />')[1],
     	attachFileId: '<c:out value="${attachFile.attachFileId}" />',
     	streFileNm: '<c:out value="${attachFile.streFileNm}" />',
     	fileSn: '<c:out value="${attachFile.fileSn}" />',
-=======
-    	name: '<c:out value='${attachFile.orignlFileNm}'/>', 
-    	size:<c:out value='${attachFile.fileSize}'/>, 
-    	type:re.exec('<c:out value='${attachFile.orignlFileNm}'/>')[1],
-    	attachFileId: '<c:out value='${attachFile.attachFileId}'/>',
-    	streFileNm: '<c:out value='${attachFile.streFileNm}'/>',
-    	fileSn: '<c:out value='${attachFile.fileSn}'/>',
->>>>>>> refs/remotes/origin/master
     	fileUploadType: 'uploaded'
     });
     </c:forEach>
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp
index 9698e738..ba841f4a 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp
@@ -38,7 +38,7 @@
  
  $( document ).ready(function() {
 
-	 fn_setPageTitle("Q&A");
+	 fn_setPageTitle("<c:out value='${pageTitle}'/>");
 	 
      // 검색 수행 이벤트  
      $("#btnSearch").on("click", function(e) {