Fixing merge error
Adding bracket
Putting in a set timeout function