Change lin 6 to make conflict