testing changes
Text changed
resolving conflicts
Resolving conflicts in git
Resolving conflicts
Resolving merge