settings pages with success alerts and non-final upload file
settings pages with success alerts and non-final upload file after resoulving conflicts