Init source
Fix conflict