committing local changes before pull
fixed conflicts in delay player
priority ordering
merged changes
started to add safety zones
started code for safety zones