Fixed conflict in propagate