diff --git a/plugins/modules/synchronize.py b/plugins/modules/synchronize.py
index bc26692..54065f3 100644
--- a/plugins/modules/synchronize.py
+++ b/plugins/modules/synchronize.py
@@ -8,7 +8,6 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-
 DOCUMENTATION = r'''
 ---
 module: synchronize
@@ -652,19 +651,17 @@ def main():
     while '' in out_lines:
         out_lines.remove('')
 
-    result = dict(changed=changed, rc=rc, cmd=cmdstr)
+    result = dict(changed=changed, rc=rc, cmd=cmdstr, stdout_lines=out_lines, msg=out_clean)
 
     if quiet:
-        result['msg'] = "OUTPUT IS HIDDEN DUE TO 'quiet=true'"
-        result['stdout_lines'] = []
-    else:
-        result['msg'] = out_clean
-        result['std_out'] = out_lines
+        changes = len(out_lines) - 1 if len(out_lines) >= 1 else 0
+        result['msg'] = "%s files/directories have been synchronized" % changes
 
     if module._diff:
-        result['diff'] = {'prepare': out_clean}
+        result['diff'] = {'prepared': out_clean}
 
     return module.exit_json(**result)
 
+
 if __name__ == '__main__':
     main()
diff --git a/tests/integration/targets/synchronize/tasks/main.yml b/tests/integration/targets/synchronize/tasks/main.yml
index 03212b3..d6dcdad 100644
--- a/tests/integration/targets/synchronize/tasks/main.yml
+++ b/tests/integration/targets/synchronize/tasks/main.yml
@@ -342,32 +342,9 @@
 - name: Cleanup
   ansible.builtin.file:
     state: absent
-<<<<<<< HEAD
     path: "{{ output_dir }}/{{ item }}"
   loop:
     - directory b/foo.txt
     - directory a/foo.txt
     - directory a
     - directory b
-=======
-    path: '{{output_dir}}/{{item}}'
-  with_items:
-  - foo.result
-  - bar.result
-- name: synchronize files without quiet option 
-  synchronize:
-    src: '{{output_dir}}/foo.txt'
-    dest: '{{output_dir}}/foo.result'
-  register: sync_result
-  ignore_errors: true
-- assert:
-    that:
-    - '''--quiet'' not in sync_result.cmd'
-- name: Cleanup
-  file:
-    state: absent
-    path: '{{output_dir}}/{{item}}'
-  with_items:
-  - foo.result
-  - bar.result
->>>>>>> 9dbedb6 (Adding tests, corrections)