Added 5th line to temp copy
Resolved 5th line conflict