fixing the merging issue~
s