Fix merge code in lesson five