adding line to temp copy
resolved conflicts