add save material order data
resolve conflict