Edit conflict.txt! I edited from CentOS.