remove leftover merge markers

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>