fixing/merging