happy face promts
merge conflict