update before pull for luke
resolve conflict