merge fix
merge fix
Merge fix 0
Trying to resolve a conflict
Still trying to resolve the conflict
Merge remote-tracking branch 'origin/gh-pages' into develop