remove merge errors

Signed-off-by: anti-freak <antifreak2011@gmail.com>