Modify issue1 file
Resolve conflict