diff --git a/src/designs/neutron/neutron-sync-agent b/src/designs/neutron/neutron-sync-agent
index 0d8a402973..e49a4a83ff 100755
--- a/src/designs/neutron/neutron-sync-agent
+++ b/src/designs/neutron/neutron-sync-agent
@@ -33,7 +33,7 @@ while true; do
     cd $NEUTRON_DIR
     git fetch
     if ! git diff --quiet origin/master; then
-	git merge --ff origin/master
+	git pull --rebase origin master
 	echo "Generating new configuration"
 	$NEUTRON2SNABB $NEUTRON_DIR $SNABB_DIR
     fi