Added logic to the use case
Resolving conflict