Conflict solved.
Take care of symbolic links in drupal root.