Remove some of the conflicted objects I missed.