Merging line.java