fix merge derp

Signed-off-by: Stefanescu Cristian <howerkraft@gmail.com>