fixed bug and merge