Fixing the damn conflicts.