added a new line into the file1.java by localrepo2
 merged successfully