Remove merge conflict artifacts

Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>