remove "target" directory - please run "git rm -r --cache target" in
your local copy if this causes a conflict