Fixed conflicts

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