I can fix conflict?

Signed-off-by: John Rayes <live627@gmail.com>