merge
merge conflict
generic name
merge
install upstart
merge
merge
upstart installation script