I add a keyword $log$ in my source file, but when i merge two branch, the log is always conflict,how to avoid ?