fixed merge conflict, added semicolons alll overrrr