corrected typo on line 139 and resolved conflict