chnages after merge