Changed a couple of files
Fixed conflicts