added unusedMethod2
Conflict resolved
Spelling fixed