task 09 and README
corrected merge error