merge all commits for settings