modifiactions after merging