First version of text suggestion
Fix conflict