Fix bug and Merge