Fixed conflicts after Arni
Fixed conflicts
fixing
added comments
Fixed confliced