testing confict in master1
savign after conflicts