merging
fixed one bug