let of multiple lines of the some code, merge fix failed, now fixed