Removed all the conflicts

Signed-off-by: Jalen Battle-Bryant <flashalot.dev@gmail.com>