Remove merge conflict

Signed-off-by: sndnvaps <sndnvaps@gmail.com>