Merge proposals

etcd-fs in Ubuntu has no merge proposals.