Add needed using statement.
Fix merge conflict.