Init
Fixed merge conflicts