Computer suggestions working
Fixed conflicts