Initial Version
Resolve conflicts