Argh git chaos, this should fix some stuff

Signed-off-by: Ivan Gozali <ivan.gozali@arrayent.com>