resolving conflicts

to get update with player direction sampling
Changing ignored files