Added naive solution
Conflict resolved