Fix Some Problem when merge code