correct recent fix

fc37456d0fe1fb0fd3e33338223977b3e7a940bb's fix caused it to try to stage a
symlink in .git/annex/tmp, oops

Command/Sync.hs

@@ -271,7 +271,8 @@ resolveMerge' u
 	makelink (Just key) = do
 		let dest = mergeFile file key
 		l <- inRepo $ gitAnnexLink dest key
-		replaceFile dest $ addAnnexLink l
+		replaceFile dest $ makeAnnexLink l
+		stageSymlink dest =<< hashSymlink l
 		whenM (isDirect) $
 			toDirect key dest
 	makelink _ = noop