Started coding in init phase
Resolved conflicts