Init Guard
Fix CONFLICT