These lines didn't look important.
Fixed conflict