append temp.txt on dev branch
merge fixed conflict