update!
Merge branch 'new_method'