diff --git a/src/csync_reconcile.c b/src/csync_reconcile.c
index 941bad5fdc..775d497577 100644
--- a/src/csync_reconcile.c
+++ b/src/csync_reconcile.c
@@ -130,6 +130,11 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
         other = (csync_file_stat_t *) node->data;
 
         switch (cur->instruction) {
+        case CSYNC_INSTRUCTION_RENAME:
+            /* If the file already exist on the other side, we have a conflict.
+               Abort the rename and consider it is a new file. */
+            cur->instruction = CSYNC_INSTRUCTION_NEW;
+            /* fall trough */
         /* file on current replica is new */
         case CSYNC_INSTRUCTION_NEW:
             switch (other->instruction) {