init
generated post scaffold with 2 methods
conflict resolved