bash prompt
merge