Resolve conflicts with origin/master to remove AI4R