Fix Fsync merge