Initial import from local machine
Resolve initial conflicts