Version 1.0
Resolve conflicts