Fixed suggest a spot. clearing up merge conflict