Fixed the god damn merge conflicts

Signed-off-by: Sovak <Sovak007@gmail.com>