Added step 10 and corrected conflict