like title, I just want to change some format with date, but when I click apply then always merge conflict error