I added a method
Fixed conflicts