1st working version
added check for merge with self
renamed scenarios as per homework instructions