test git pulling without respecting local changes
test git pulling without respecting local changes (r2)
Fixed silly merge conflict with a silly method but oh well...