Commit for solve the conflinct with strings