Change string again
fixed merge conflict