missing conflict resolved