Add new method
Fix conflict