change prompt
merge conflict