Added second
Removed thing
Fixed conflicts