Cleaned up old prefabs.
Resolve merge conflicts.