Please make sure to solve your merge conflicts before committing -_-

Signed-off-by: Wim Tibackx <wim.tibackx@student.kdg.be>