Cleanup entity merge feature