Added a new method
resolved method addition conflicts