clean merge stuff

Signed-off-by: Sam Troxel <stroxel2323@gmail.com>