fixed some conflicts

Signed-off-by: Quinn Unger <quinnunger@hotmail.com>