Fixed conflict left in file