fixed a missing semi colon and a merge conflict