Local & remote merge, binaries included.