Fixed few bits
Fixed conflicts