fixed corrupted lines from merge