Removed bad code from broken conflict