Deleted double import caused by merge.
Deleted unused import caused by merge.
Added a semicolon. Blame the merge.