change end git conflict