fixed missing semicolon issue
merge conflicts