fixed merge conflict in results