missing semicolons
merge conflict
fixing merge conflict