Init source
Resolved conflict