attempting a merge
Fixed conflicts