modifiying unmerged files