[ethagnawl]

Re merges: that's very compelling. I've encountered that issue many times using Dropbox for syncing.