check conflicts
second file
getting upto data