Initial version
Resolving conflicts