diffMerge
delete obj/bin