Implemented turnResolve logic
Merge