Add comment to eunji about crash
correct merge problem