g1 conflicts
Resolving conflicts