path and alias update
resolve conflicts
Config updates