Fixed merge bugs that were caused by the means of identifying location changed.