remove merge and lower the lock to 240 sec
Merge pull request #1 from aviramradai/remove_merge

remove merge and lower the lock to 240 sec