Source: block: Fix conflict
Signed-off-by: nicholas <firepoison35@gmail.com>