Adding dired+
Bad merge