init
Resolve conflicts