Initialization
Resolved conflicts