Resolve conflict
Resolve conflict
Check OOP