fixing bug overlap
merging