Fix some merge issues, add block device parsing