COMMIT BEFORE pull
Merge origin/master
Merge origin/master
fixed still java.util.ConcurrentModificationException