kdiff pathing
merge conflicks resolved