Code corrected and made working

fault due to conflict removed