change some code to test conflict between two repository
resolve conflict when merge code