set basic OOP patterns
Repair conflict