Try this for fixing trespassing.
Merge remote-tracking branch 'origin/master'