Init
Conflicts resolved