Added 1
Added 2
Changed next
Fix merge conlfict