Merged computer AI back into master