Removing overlays and underlays for a system that works better with the rest of the engine's architecture
Resolving merge conflicts
Merging conflicts