Changed the start method to init
Fixed merge conflicts